From: Joakim Verona <joakim@verona.se>
Date: Sun, 25 Jan 2015 01:11:31 +0000 (+0100)
Subject: merge master
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3393
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e5087278b9bcab5847ce63d80c0d74c27f50e719;p=emacs.git

merge master
---

e5087278b9bcab5847ce63d80c0d74c27f50e719